]> dgit.raspbian.org Git - gnome-shell.git/commit
Revert "status/keyboard: Track ::layout-layout-group-changed for changes"
authorSebastian Keller <skeller@gnome.org>
Tue, 28 Oct 2025 22:22:26 +0000 (23:22 +0100)
committerFlorian Müllner <fmuellner@gnome.org>
Mon, 24 Nov 2025 13:42:59 +0000 (14:42 +0100)
commit14229beadde047fbc9aaca2818cf729f15816aef
tree76799d11a63f825db1e082dd1cc51d36b05fe041
parent88686b76ad970a359c4079e71f64d11625e69620
Revert "status/keyboard: Track ::layout-layout-group-changed for changes"

This reverts commit e8d73262c73246205e8f7887d99aeb2356cfa89e.

The commit was causing freezes when changing layouts in some situations
and not all of these were adressed by f643915b, such as when switching
from the 3rd to the 4th layout using a xkb shortcut in the X11 session
with 4 layouts.

It was also breaking the order of switching layouts using modifier-only
xkb shortcuts to switch to the next group, which it caused to advance
multiple groups because of the shortcut being handled via both
_modifiersSwitcher() and _layoutGroupChanged().

Further it was possible for _layoutGroupChanged() to trigger an error
due to the locale layout added by _buildGroupStrings() at the end of the
xkb layout list being accessible via the xkb shortcuts. That layout was
not present in _inputSources, leading to "is" being undefined.

Reopens: https://gitlab.gnome.org/GNOME/mutter/-/issues/3926
Closes: https://gitlab.gnome.org/GNOME/gnome-shell/-/issues/8738
Related: https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/3930
Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/3939>
(cherry picked from commit d6123a003afc9665e7b0067a46dc93b19ea52c07)
js/ui/status/keyboard.js